From a60c866a1290a24a4ad2ffe130045ddeabe828d8 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Wed, 3 Jun 2020 18:12:49 +0200
Subject: [PATCH] listbase: Don't grab_focus() when moving focus

We want to call gtk_widget_child_focus() to have Tab focus the right
widget.
---
 gtk/gtklistbase.c | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/gtk/gtklistbase.c b/gtk/gtklistbase.c
index c163ccf6fa..5aedeb5d34 100644
--- a/gtk/gtklistbase.c
+++ b/gtk/gtklistbase.c
@@ -455,7 +455,15 @@ gtk_list_base_focus (GtkWidget        *widget,
                      GtkDirectionType  direction)
 {
   GtkListBase *self = GTK_LIST_BASE (widget);
+  GtkListBasePrivate *priv = gtk_list_base_get_instance_private (self);
   guint old, pos, n_items;
+  GtkWidget *focus_child;
+  GtkListItemManagerItem *item;
+
+  focus_child = gtk_widget_get_focus_child (widget);
+  /* focus is moving around fine inside the focus child, don't disturb it */
+  if (focus_child && gtk_widget_child_focus (focus_child, direction))
+    return TRUE;
 
   pos = gtk_list_base_get_focus_position (self);
   n_items = gtk_list_base_get_n_items (self);
@@ -468,12 +476,12 @@ gtk_list_base_focus (GtkWidget        *widget,
 
       pos = 0;
     }
-  else if (gtk_widget_get_focus_child (widget) == NULL)
+  else if (focus_child == NULL)
     {
       /* Focus was outside the list, just grab the old focus item
        * while keeping the selection intact.
        */
-      return gtk_list_base_grab_focus_on_item (GTK_LIST_BASE (self), pos, FALSE, FALSE, FALSE);
+      old = GTK_INVALID_LIST_POSITION;
     }
   else
     {
@@ -513,14 +521,18 @@ gtk_list_base_focus (GtkWidget        *widget,
         }
     }
 
-  if (old != pos)
-    {
-      return gtk_list_base_grab_focus_on_item (GTK_LIST_BASE (self), pos, TRUE, FALSE, FALSE);
-    }
-  else
-    {
-      return TRUE;
-    }
+  if (old == pos)
+    return TRUE;
+
+  item = gtk_list_item_manager_get_nth (priv->item_manager, pos, NULL);
+  if (item == NULL)
+    return FALSE;
+
+  /* This shouldn't really happen, but if it does, oh well */
+  if (item->widget == NULL)
+    return gtk_list_base_grab_focus_on_item (GTK_LIST_BASE (self), pos, TRUE, FALSE, FALSE);
+
+  return gtk_widget_child_focus (item->widget, direction);
 }
 
 static void
-- 
2.30.2